ioemu: Use XEN_TARGET_ARCH instead of uname -m.

Signed-off-by: Bastian Blank <waldi@debian.org>

diff --git a/tools/Makefile b/tools/Makefile
index 14abf6026d7ded8f035b953f7660bc20d953b87b..fddf7e580156d3f2e7de42bde1b5d78804b778b5 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -78,7 +78,7 @@ IOEMU_CONFIGURE_CROSS ?= --cross-prefix=$(CROSS_COMPILE) \
 endif
 ioemu ioemuinstall:
        [ -f $(IOEMU_DIR)/config-host.mak ] || \
-         ( cd $(IOEMU_DIR) && sh configure --prefix=/usr \
+         ( cd $(IOEMU_DIR) && XEN_TARGET_ARCH=$(XEN_TARGET_ARCH) sh configure --prefix=/usr \
                $(IOEMU_CONFIGURE_CROSS) )
        $(MAKE) -C $(IOEMU_DIR) $(patsubst ioemu%,%,$@)
 ioemuclean:

diff --git a/tools/ioemu/configure b/tools/ioemu/configure
index 767089c127c801918f6b814ccb551978ce0163d7..70cc1e997d41579ce230c548a6e2a6d73d6f7967 100755 (executable)
--- a/tools/ioemu/configure
+++ b/tools/ioemu/configure
@@ -29,43 +29,15 @@ ar="ar"
 make="make"
 install="install"
 strip="strip"
-cpu=`uname -m`
 target_list=""
-case "$cpu" in
-  i386|i486|i586|i686|i86pc|BePC)
+case "$XEN_TARGET_ARCH" in
+  x86_32)
     cpu="i386"
   ;;
-  armv*b)
-    cpu="armv4b"
-  ;;
-  armv*l)
-    cpu="armv4l"
-  ;;
-  alpha)
-    cpu="alpha"
-  ;;
-  "Power Macintosh"|ppc|ppc64)
+  powerpc)
     cpu="powerpc"
   ;;
-  mips)
-    cpu="mips"
-  ;;
-  s390)
-    cpu="s390"
-  ;;
-  sparc|sun4[muv])
-    cpu="sparc"
-  ;;
-  sparc64)
-    cpu="sparc64"
-  ;;
-  ia64)
-    cpu="ia64"
-  ;;
-  m68k)
-    cpu="m68k"
-  ;;
-  x86_64|amd64)
+  x86_64)
     cpu="x86_64"
     libdir="lib64"
   ;;